fixed layout issues. Fixed linking issues