Layouts for Achievements & Main improved