Added some stuff to board layout and cleaning