Reshuffle layout
Complete refactgor