Fixed text margin
Fixed GUI issues