Code refactoring.
Layout refactoring.
Bug fixing.