Edited some views to make it more user friendly