Small fixes and board layout