layout fixes done
style changes and more