SLight layout fixes