Fixed button and text formatting - Kevin (kchen87)