Layout changes. CSS clean up. Bug fix. (Repository link)