Re-indented code and remove horizontal scroll due to being buggy