Reorganized some views
Added toggling buttons
Restructure
Many small fixes
Small fixes
SF