fixed compilation error
modified layout