better design for main page + minor changes.