added top bar and tweaked buttons