Remove tabs
Improve layout