added saveMe feature and modularized views