Added styling and added features