Aestethics Fixes