Adding my own layout.
cosmetic
General cleanup of things I don't need