added todos
added fixme
deleted unused stuff from view
changed order of buttons and captions