Minor updates
Refactor layout