Improvements

Interface improvement
Added Layout Functionlities