removed hard coding in main view since it works for Jocke again