Added visual tweaks, changed some views to make them more consisten