Added more stylish buttons and have started adjusting per Andrew's revisions