Adding changes to screen views and more buttons