cleaning up theme & removing gray background