Removed bottom navbar and one empty div
Added TODO