Fixed issues, adapted layout for small screens