EPG Layout fixes
Merge branch 'development'