init bug correction + begining layout refactoring