fixing controller back
updated views

these views are the updated ones, or they're closer than the ones
currently on github