moved stuff and made prettier