Deleted unnecessary components and methods, added field instead of combo-box for Availability attribute, small fixes