Fixed the layout and finished command parser

Signed-off-by: Andoni Aguirrezabal <aaguirrezabal@live.com>