Rounded buttons and changed order form