Bug fix + Layout refactoring