ruzne male upravy, predevsim ve view

Change-Id: I6f58eb679145ee0aa9e368112eafbd0b37681fd8