Including hiccup and implemented initial view + various fixes