Cleanup

General cleanup, got rid of magic numbers, added a missing
lcd_image_draw call. Test this