Fixed problems with responsive layout (come back to this later)