Improve layout using flex