Refactored layout and structure, solved inline editing