Some updates making it more pretty