Layout changes and crashes

layout changes to accommodate scroll and fixing few crashes.