bug fixes + button locations + UI