- start refactoring layout application
 - cleanup