bug fix
Bug Fix and Theme Improvements
Merge remote-tracking branch 'origin/master'