Improving general layout