Polish

Mostly focused on the newly incorporated calculator panel