AMO Frontend Polish