Added #yukkuri and made layout a little better