Fixed layout issues and updated the makefiles

Fixed layout issues and updated the makefiles