Cleaned up redundant code
Addition of homeLayout
Completed implementation of home layout