Aestetic changes and fixes