fixed layout problems
various changes