some decent layout after feedback from elco, a good start i think