Fixind layout disaster