Fixed more issues(responsive layout)