Add component support and change the look a feel a little