Finalizing a few layout things, it looks prettiful now