Added buttons and re-arranged view pages