Refactoring, adding styles, finish box