Add CSS, improve layout