i forgot to check out a branch, layout is a little more finished