cleaned up code, split media queries and added kindle fire specific queries