Fix small layou issues. #10