add drawer, dropdown, and cleaned up some things