fixed some button placement and compile errors