fixes for spinner layout

revert back to old theme