organization & small front end fixes