Fixed, still some visual bugs. Resolves #9

Fr rlz this time.