Follow-ups to #21.

- Reverted "Extends ScoresData bg to clock", as this was intended behavior.
- Fixed overlapping text in the options menu, and made it look more similar to the other menus.
- Fixed issues with the text and icon in the song menu header in certain resolutions.
- Fixed minor issue with ranking screen header text positioning.
- Decreased skip button hover scale.
- Some code style changes.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>

src/itdelatrisu/opsu/OsuHitObject.java

@@ -298,10 +298,7 @@ public class OsuHitObject {
 	public boolean isNewCombo() { return (type & TYPE_NEWCOMBO) > 0; }
 
 	/**
-	 * Returns the number of extra skips on the combo colours
+	 * Returns the number of extra skips on the combo colors.
 	 */
-	public int getComboSkip() {
-		return (type >> 4);
-	}
-
+	public int getComboSkip() { return (type >> TYPE_NEWCOMBO); }
 }