Fixed queries and tweaked styling #41