Improve the general layout