Improve layout and make it responsive