Adding full UI functionality