Neater Format

Changed format of the current buttons