Just moved stuff and worked elements a bit better