updated with new layout and toggleview