Layout Fixes ... Shahid

Now horizontal scrollbar remaining