fixes and new layout