Feature/02fix layout