Feature/main design