Design and Routing changes

Signed-off-by: Matthew Pabon <matthew@mjpg.com.ve>