layout and refactoring
layout
Using layout views, refactoring, formatting