Layout functionality working, UI updated