fixed many issues on layout. Still correcting..