WIP: Clean up query.
WIP : Update CSS