further ui stuff and a first version of naming convention