Fixed some functionality and tyling bugs from the merge and performed final tweaks