Separate UI descriptions and add new classes. Close #8

#8