Updated the XBMC queries and minor layout changes