added more choices and tweeked views