made few changes. WIll see, how it looks in production!