Implimented better button placement, added text