adding sassy buttons and rearranging base layout