Cleanup layout and beginings of showing mag