AMO Frontend Polish

90