changed placing of widgets in layout. Changed write in YaVersion to include xxx_COMPONENT_VERSION