everything looks pretty now + some minor changes