Fix layout
Clean back-end code