Some fixs. Also better layout. TODO: Manage rotations