Changed definition of some layout classes to the main kv file