Fix layout and drop useless stuff