Fixed parsing and removed Masonry.

Signed-off-by: Lenny Nilsson <nilsson.lenny@gmail.com>