Added more windows forms elements, nearly complete