More desing changes and javscript horror.