CSS tidy up
renamed Uuid as Id and made it part of model