Changed layout, optimized imports