CSS'd da foc outta da app
resoved merge conflict july 21 4pm