Cleans up stuff
Aiming at using layout