EPG Layout fixes