Updated Views and Rounded buttons