Adding options section (it currently sucks)