Cleaned up reg views and app layout