Make everything more stable, add some styling