Cleanup layout and styles, Add tabdrop