Fixed some views and added bottom navbar