Minor UI change, buttons made nicer and reorganized