Merge feature/basic ui into develop