Created a better starting form + some minor changes