Added modified views for better user interaction