fixing style issues, not yet complete
adjust for mobile