Code refactoring, layout improvements.