Fixed all issues - now working on resposiveness