Update LunarView

Cleaned up code and made it easier to read