Adding remaining project + some style tweaks