Feature/simplifyui