Improved layout

Mostly @Override addition