Commit on 12 Mar 2013

Commit on 12 Mar 2013 bug fixes and new design implemented