resolve warnings
member access
improve layout