implemented initial version of view + some fixes