UI Complete with all changes