Some css/html changes
changes to controller
merge to one branch
deleted files