bit of format + button ui additions